Skip to content

gitAndTools.git-annex: fix darwin build#76342

Closed
veprbl wants to merge 1 commit intoNixOS:masterfrom
veprbl:pr/git-annex_darwin_fix
Closed

gitAndTools.git-annex: fix darwin build#76342
veprbl wants to merge 1 commit intoNixOS:masterfrom
veprbl:pr/git-annex_darwin_fix

Conversation

@veprbl
Copy link
Copy Markdown
Member

@veprbl veprbl commented Dec 24, 2019 •
edited
Loading

Motivation for this change

git-annex doesn't build on darwin, I suspect a case of NixOS/nix#1085
Fixes: #73435
Helps with: #40783

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added 6.topic: darwin Running or building packages on Darwin 6.topic: haskell General-purpose, statically typed, purely functional programming language 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux. labels Dec 24, 2019
@veprbl
Copy link
Copy Markdown
Member Author

veprbl commented Dec 24, 2019

Should this target "haskell-updates" instead?

@cdepillabout
Copy link
Copy Markdown
Member

cdepillabout commented Dec 24, 2019

@veprbl Since it only affects Darwin, it is probably fine to merge into master, but we usually merge Haskell-related changes into haskell-updates.

This looks good to me, and it builds on darwin, so I think it is good to merge in.

veprbl added a commit that referenced this pull request Dec 24, 2019
@veprbl
gitAndTools.git-annex: fix darwin build
18c2874 
Closes: #76342
Fixes: #73435
@veprbl
Copy link
Copy Markdown
Member Author

veprbl commented Dec 24, 2019

Pushed this to the haskell-updates.

@cdepillabout
Copy link
Copy Markdown
Member

cdepillabout commented Dec 25, 2019 •
edited
Loading

This is commit 18c2874 on #75857 for haskell-updates, so I am going ahead and closing this.

Thanks veprbl!

peti pushed a commit that referenced this pull request Dec 26, 2019
@veprbl @peti
gitAndTools.git-annex: fix darwin build
3837d22 
Closes: #76342
Fixes: #73435
peti pushed a commit that referenced this pull request Dec 27, 2019
@veprbl @peti
gitAndTools.git-annex: fix darwin build
c744527 
Closes: #76342
Fixes: #73435
@veprbl veprbl deleted the pr/git-annex_darwin_fix branch December 1, 2020 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@basvandijk basvandijk Awaiting requested review from basvandijk

@cdepillabout cdepillabout Awaiting requested review from cdepillabout

1 more reviewer

@marsam marsam marsam approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

6.topic: darwin Running or building packages on Darwin 6.topic: haskell General-purpose, statically typed, purely functional programming language 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 0 This PR does not cause any packages to rebuild on Linux.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

git-annex: 5 out of 366 tests failed

3 participants

@veprbl @cdepillabout @marsam